Pre Code Freeze Release

Change-Id: Id20830e8df8c38b7d31068e48857c7c946f16976
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>

Conflicts:
	config/common.mk