rm -rf halimpl/ am: 5f4e21362f
am: 1494576283

Change-Id: I2ca49eab0b2a5bc82a88d4882741b1278da7ecbb