Merge "Dist aapt2 protos" am: b602193169
am: 0783f2d300

Change-Id: I7c5650cc603162aef18341c3fa79abf23cc1e55d