Merge \\\"Remove build/libs\\\" am: fcb8a89c3b am: 3c48705b9b
am: 947c5715f8

Change-Id: I16ff47ee232cfd37a0671e83c7684c04064831be