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

Change-Id: I1d6ea588270c472ec29d7164b0b50cdd062a1a22