Merge "Add getmtime to Android KeyStore API" into jb-mr1-dev