Compatibility patches

Change-Id: I2ed2742fad1bdea8f286db02b8a9ba4534afd738
Dont include invensense

Change-Id: I377d929f4f7d7578ce85dee23d5281f10ba67af0