Contribute emf-emf and emf-emf-rap M3 build 2.21 for 2020-03

Change-Id: I0938dae16c7df77a611eb3dc1879d3245f08b9ee
Signed-off-by: Ed Merks <ed.merks@gmail.com>
2 files changed