[automerger skipped] Support forcefully generating non-AB packages. am:...
[automerger skipped] Support forcefully generating non-AB packages. am: 65afc07f am: 2e12b29c -s ours am: ae221fbf -s ours
am skip reason: Change-Id I5e81eb161722e07ef50081b6a16685cbc9963ae2 with SHA-1 7169f754 is in history
Change-Id: Ie95c17a54a115ec2ee4cf1069e4bb0e7e0ff4d3d