Merge remote-tracking branch 'aosp/master' into sm-jb-mr1

Conflicts:
	common.mk

Signed-off-by: Paul Beeler <sparksco@gmail.com>