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

Change-Id: I799dcb17afa68adac07d9c5e624684da63793c7f
12 files changed