Merge "Convert Android.mk file to Android.bp"
am: ef8a4f27bd

Change-Id: Idb90e1d1369dce158b55751406f3dfb3b7c5a127