Bug 496465 - Prep for 4.7 (Oxygen) and 4.6.1 (Neon.1) maintenance builds

Change-Id: I0e727ae10bff1c7ab712636cdb715d12016b807d
12 files changed