Merge "APK Cache Demo App"
am: cd3a0fe97c

Change-Id: I6ef0f19730bb625531fdc9b3fb827d83b37fc2de