Merge "Convert Android.mk file to Android.bp" am: 23ab3ba225

Change-Id: I3bd8cfddf11c67cb7e02d9e80132560c16e355da