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

Change-Id: I6c4fdea65b69f195832ee93cf4199b0ce4d69d4e