Cleanup Lights Android.bp am: fabe9e4bef am: 1617ee8132
am: b31e72c574

Change-Id: Ia2bf7eae93ae3252339b55de7b0080a04d808625