Merge "Add Metalava based android.jar targets in Androi.bp"