This reverts commit 584979bf55601bd23e533d704a75cd0e95af66b9, reversing
changes made to 219bbcdcd5b1dbf19758ff2e75d971b98215896d:
      Remove libprotobuf-java-lite
      Update stubs
      Revert "Wrap liblog dependency in GOOGLE_PROTOBUF_MIN_LOG_LEVEL"
      Update javamicro to compile against v3.5.2
      Update Android.bp to match BUILD
      Rerun configure
      Merge tag 'v3.5.2' into master
      Revert "Remove 2 usage of isspace as they are not stl port compatible"
      Revert "Use GOOGLE_CHECK Macro for validation"
      Revert "Emit macros with proper parentheses."
      Revert "Generate syntactically correct java for imports from classes with no packages."
      Revert "Fix some unused parameter warnings"
      Revert "protobuf: work around a static analyzer bug"
      Revert "Suppress clang-analyzer-core.uninitialized.UndefReturn warning."

Change-Id: Ia04c0b15ebd45e8c7e02edaa6e1f10aeb11ef337

* Fix more memory leak for php c extension

* Fix memory leak for php5.5

* Fix php well known type conformance tests

* Properly generate code for test.proto

* Provide GPBMetadata files in c extensions for generated files to import.

* Remove unnecessary test

* Clean up code

* Add declaration for initOnce.

* Refactoring

* Add well known types to php runtime.

* Fix php7.0 tests

* No longer generate empty.proto in test as it has been included in
runtime.

* Fix zts build

* Clean code

* Rename g_p_b_empty to empty.

* Don't generate code for empty.proto in compatibility test

* Fix 32-bit

* Fix mac build

* Fix Makefile.am to add new files

It needs "-I" flag to find imported file google/protobuf/timestamp.proto