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

Change-Id: I208cf823efc29610c2978719eed5ca44a16c6454