crdroid import for AOGP

Change-Id: Ie840bb2eb7a2420591f6a42e439c93f93954d03d