MErged tags and commits from AOSPA-legacy and CM

Change-Id: I92dd4ef9b3d226f75ac017f13b9a88d9a9da956e
Signed-off-by: klozz <xxx.reptar.rawrr.xxx@gmail.com>