Merge "Add metalava based api-stubs modules in Android.bp" am: f907578564
am: 25d4494793

Change-Id: I61a4f39fdef76aa49dea1b007b805cac5e55526f