Merge "Convert hostsidetests/dexmetadata/**/Android.mk files to Android.bp" am: 5f66966359
am: dc6f930adc

Change-Id: I2b2c7502ef71e1a49f821fd4128defe368ed89b5