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

* commit '823d5bbc204da3da76aa78253143e73fe29696d9':
  Remove invalid uses of -l and -I

Change-Id: I08e4393d2d59bb8c202c17fe2650226a5b80b194