Update nexus7(3g) to use muppets props

Change-Id: I150d4d149adfb1501130d62ab39ef3792a4d2b25
Merge remote-tracking branch 'upstream/jellybean' into HEAD