Merge "Add AsyncTask to compiled classes" into oc-dr1-dev
am: 19b979ca85

Change-Id: Id8efcf64451df4ab5d8636207434a21c34334b77