Merge branch 'Domination' of https://github.com/Domination-personal/android_build into Domination

Change-Id: I39eb895da90056970b17e1a2a03b6fa920d1a855