Merge "Remove ApiDemos and other packages modules in /data/app"
am: 8d36d4b8ea

Change-Id: I2ea07715ac3ba7a5e4dedd0dda4778cc2e47eeab