Merge \"Remove etc/META-INF/com/google/android/update-script.\"
am: 5b2191a9d6

Change-Id: Ie27f4c9d78de710eb45a87fed9c0aaf6b71404b6