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

Change-Id: Idd9b73bf5cd9309d7768957b897524dace8ade95
7 files changed