Merged branch "aosp" with "Android"

Signed-off-by: Amperific <amperific@gmail.com>