[automerger skipped] Merge "[RESTRICT AUTOMERGE] Apply Android.patch to dist directory" into pi-dev am: 3495381899 -s ours am: be7f12d7d4 am: c560d2a745

Change-Id: Id86b73ed11be3d3292269b3a8b2022fccd9151df