[automerger skipped] Merge "[RESTRICT AUTOMERGE] Apply Android.patch to dist...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Apply Android.patch to dist directory" into pi-dev am: 34953818 -s ours am: be7f12d7 am: c560d2a7 am: 89adcd36 -s ours
am skip reason: subject contains skip directive

Change-Id: I1e0aab6a2152af61271f7bb213e9d247c5e28250