Merge changes I20d546fd,I15363803

* changes:
  Allow "android" package name.
  Update is_valid_package_name() to match framework.