Merge "Convert Android.mk file to Android.bp" am: 93068a3c58
am: 7a336bcdd6

Change-Id: If5e063787debf0361732489375b194b4c9a082a8