merging FRF15 for dalvik-dev

Change-Id: Ic8c9dea280d38cba8e55f962f0d8df843aea8e35
9 files changed