Merge "Convert Android.mk file to Android.bp"
am: 6cb9de0e1c

Change-Id: If1f4b8016eb2ee64eda0589c99674b8e14e2872d