[automerger skipped] Merge "API: enable API lint on public and system APIs"...
[automerger skipped] Merge "API: enable API lint on public and system APIs" am: f8928da8 am: 85bd7e7e am: 1775ad78
am: 51984add -s ours
am skip reason: change_id I1457917dbdff1c1738c17b4d9683a79add971b34 with SHA1 b4f91321 is in history
Change-Id: Id7a14d0c1728026b3468720ff1beb981028ced56