Merge src-N/ and src-pre-N/ and target API 24 (1/3)

Bug 29725318
Bug 29328819
Bug 29536552

Change-Id: I21854806fbf5c9a6e0fff3d12702bfaa96e04b26
5 files changed