Merge "Export asm-6.0 as device modules" am: ac4db5fb60
am: 474ab2b8bb

Change-Id: I73ba9859a02ad57c638da6e2cce18bd57c773dd4