Merge "Remove invalid uses of -l and -I" am: 5d6193c658 am: 9ae3c079dc am: 823d5bbc20
am: 5038e978ed

* commit '5038e978edb808dc3d0265353d19c7cfb483e8e7':
  Remove invalid uses of -l and -I

Change-Id: Ifc5d76b3375e6c63f1da1915b03988cfe2ad5603