Merge branch 'L5' of https://github.com/VanirAOSP/frameworks_base into EXODUS

Change-Id: I44a8b6483923e5fb02cd7e61c41a1560cc3f4f5c